widget: 3-way merge ate my g_object_ref()
authorCarlos Garnacho <carlosg@gnome.org>
Fri, 16 May 2014 16:58:11 +0000 (18:58 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Fri, 23 May 2014 17:54:32 +0000 (19:54 +0200)
commitf81f00ed6bae414349d6022a58c89d3a152030be
tree14bcbcd5df69b9b3aac04e38d81e0ba7fc45cfa0
parentd351c521148489f03c4cb4949922e58e62674f40
widget: 3-way merge ate my g_object_ref()

Move it to the right place.
gtk/gtkwidget.c